#296 - Slight bugfix