#280 fix