#296 - Slight bug fix