[#100] Final adjustments
[#100] Solve problem