Attempt to fix #600 (by @sitaktif)