#299 fix