#167: Resolution

#167: Resolution