hackishly fix package separation