Fix drawer not assigned