Solve issues #1