Fixes #456. Props aagam94