#15 #21 #24 resolved