Helps #594
Helps #594