Issue 274

Solves the bug#274