Attempt to fix bug #4

!! Revert this !!