Cleaned up from fixing #25