Fixed bug intorduced in dev. #252