fixes #1544

There may be a shorter way to do this?