messy bugfix >.<
refactored specs