[#30] Marcin Grzejszczak's suggestions