Fixed #283
More fixes for #283