[SQUASH ME] addressed latest commenty by @haukepetersen