Issue 282

Fix #282