Added specs & bugfix