#16 merge fixed