Fixed #30. Finally!