Still on alpha and bugfix related to