refixes #299