Removing premature optimization to fix #21