Fixed #4

Not really a DRY solution