Quick fix (See #49)