#rabbit-61 Fixed