Solve issues #3