Fixes #48. Reverting the last changes. It actually is worse.